Revert 16cf05a..16ea630

This rolls back to commit 16cf05a4554064ec7ad54c26c35925d2b2364157.