Revert df44ef3..0bd8aa5

This rolls back to commit df44ef3bd87eb82d3b237d59c41193a78ed1c270.