Revert 1b2e0f2..9cb2b21

This rolls back to commit 1b2e0f2902c88aedceba18859a0e579883b3ee41.