Revert 4534337..3357200

This rolls back to commit 45343377c5f55eb409841e9dbcca6e42ee9814c9.