Revert 59ac534..e08af1b

This rolls back to commit 59ac5345ac2a906396209f3b08cc539413d34755.