Revert 7596b3d..1f32dec

This rolls back to commit 7596b3d24658e4c7da72290e9f21f53d6c717c63.
Revert "Revert 7596b3d..1f32dec"

This reverts commit 3082a7680ab055286a02a3f41b160e3ca1508a42.