Revert da15baa..4da6835

This rolls back to commit da15baa50501e5b1d92a524a1789706fa509dec2.