Revert 8ecc555..16a32e4

This rolls back to commit 8ecc55568a12a0203599240f1665b92f3bd002ba.