Revert a641f7b..0c37d9b

This rolls back to commit a641f7b4739e5452142c9153121e2553c0bc5727.