Revert e712188..1511547

This rolls back to commit e7121887ccc39a6b366b1f15800b11bec4e1bb42.
Revert "Revert e712188..1511547"

This reverts commit a92edd4698250e022314ba49c282aa22d68f64ce.