Revert 9a5ac99..56b4ff9

This rolls back to commit 9a5ac99527fc6765aca2e649dcff091b8d4bae2f.