Revert 9d00314..36672f1

This rolls back to commit 9d00314f96a7a52befd15a9348bc456ef2112aaa.