Revert 99462ee..0db7bd6

This rolls back to commit 99462ee7af40a6effe91cd57a5bd4520e707eb2b.