Revert c60fe57..d131d37

This rolls back to commit c60fe57f595f0770c8f18ad1e26660df034aed80.
Test