Revert dd04d5a..0ab46f7

This rolls back to commit dd04d5aa2c1217395b68df8fbe3365c6fade756d.