Revert 381d9cb..a95d60b

This rolls back to commit 381d9cbb77907b83e55a66a9a736ba22c509fcba.