Revert eabf826..1c6684d

This rolls back to commit eabf826b5193c6050de71ce197b77a28b5bbf397.
Revert "Revert eabf826..1c6684d"

This reverts commit 4e74334e4f0f2965e8512d431ccfe6a7ea50d3b2.