Revert e74a220..27a3c1b

This rolls back to commit e74a220cd042c1f6584c2968cde13d171aac421d.