Revert 217362c..8c3b380

This rolls back to commit 217362ccd8785f5cdeaf1f844ac07af0d554a08b.