Revert 4e79439..e8d286f

This rolls back to commit 4e79439bd7fe211fc8590bcd789db1ad7b3dd804.
Revert "Revert 4e79439..e8d286f"

This reverts commit 3f4fb6d0aac38cd091a03a505bab7fddad9a1283.