Revert 5302cb2..75707f7

This rolls back to commit 5302cb26563c0a4ab783e258a47385e1eb045a9d.