Revert 84e7880..fee08de

This rolls back to commit 84e78801bd0c685ecc35323726cc2fac12658b3c.