Revert 0f4fe5d..b7794cd

This rolls back to commit 0f4fe5df2b3f88263c14d7acc77ece7f31fd2a9b.