Revert 19103ba..ba07fa8

This rolls back to commit 19103ba21245fade824860cc2a9c6c3ce4c05cb3.