Revert e8c5c2e..6ce5afe

This rolls back to commit e8c5c2e04c0b82de283e75e3a201049448ad6267.