Revert e8bcf44..081026b

This rolls back to commit e8bcf4476b20708827daf7680b385eb93ea8e3b6.