Revert 3b400b1..04f77d7

This rolls back to commit 3b400b12e5bbabf82f977323b8cfd6d962042bb8.