Revert dac476e..4ef19d0

This rolls back to commit dac476e4e1150568939a749957e8b0be1387e413.