Revert df2c6ed..fa37943

This rolls back to commit df2c6edfe0900e9f07d9369536ce905236d99c69.