Revert 51655a1..bf1496b

This rolls back to commit 51655a1e18b5adeb5c2718f8dcdb65cf5e517f22.