Revert 9138651..7c5be3c

This rolls back to commit 9138651cec330e0cab530c6cd8991637b251564e.