This reverts commit a6ab4867, reversing
changes made to 5c7900bc.

Bogus test phase.