Revert e1f77b3..28e75c8

This rolls back to commit e1f77b38406eb53b7499cec3885989f31de99c1f.