Revert 9146aed..5b3a7cb

This rolls back to commit 9146aedb1e27f52cad1700d48e36feae5ec37d2b.