Revert e4ac023..b200094

This rolls back to commit e4ac023d1b90ddef621ad37f79b7371bda7a1eae.