Revert 8997275..abbba00

This rolls back to commit 89972757dcae3ffc6c45b01af1177025b4eee7a5.