Revert e8328b7..80969b5

This rolls back to commit e8328b71875b99efdd5636ed565229c126d616eb.