Revert f24045d..e3f44d8

This rolls back to commit f24045de6d4d6d909bcb6c531e7b1fc9b4aec832.