Revert 7964d9a..1e79a82

This rolls back to commit 7964d9a1e68cae4e07d2b167164e6c5eebf2684b.
Revert "Revert 7964d9a..1e79a82"

This reverts commit 44e3d6dbb837e8cbca47283cb8d77a9755049b68.
Revert 44e3d6d..269f106

This rolls back to commit 44e3d6dbb837e8cbca47283cb8d77a9755049b68.