Revert faf4d0e..d4a0682

This rolls back to commit faf4d0e8b87228a3750e7e728528f5dabfc633ac.