Revert 1bc2def..55b35cf

This rolls back to commit 1bc2defaebacc8c2bc99f0418cea9d0aa9efd570.