Revert bbe4ba8..83283d3

This rolls back to commit bbe4ba8ae84e022bb71dfba89517c8123635691b.