Revert 0493923..5027763

This rolls back to commit 049392304cea7ab2cd1e886349edb191a1876f4a.