Revert de79a14..2e95594

This rolls back to commit de79a1470c65fcc8cb11d6dfd2897c9966eb65df.
Revert "Revert de79a14..2e95594"

This reverts commit 518ee585106d2ac8865592b4d721d165c6171e5d.