Revert f010e62..5fbb140

This rolls back to commit f010e62e9a7cf1eabc0c19fd5bc96cf32b79a0bc.