Revert becbb07..2d0df6f

This rolls back to commit becbb070263aed6277759bbb383dc379702dfa21.