Revert 162c4b8..2e5c8c7

This rolls back to commit 162c4b818aad184a6091c8e8c5c0ddd1728775b6.