Revert e8f1f00..4d1e550

This rolls back to commit e8f1f003465b631fa71a6a7386cf4931abdee6cd.