Revert 7e826b6..09bc893

This rolls back to commit 7e826b643983e8f12e659e753b74d9645d7a4342.