Revert 3fc417f..479f4b1

This rolls back to commit 3fc417fdad168bd39515fb501553a93ba80ed5b8.