Revert fa220ff..6495cf6

This rolls back to commit fa220ffbb016aca6bc4b67dc4a721067bb40cb40.