Revert 3e9b21a..7ee74aa

This rolls back to commit 3e9b21a7b8244b4c05f518d78ac6b11db4f308b7.