Revert 91212ea..c4e01e3

This rolls back to commit 91212ea0af7f3e9bb6fcc2ee13a25cbf2b8c1a49.