Revert bbab04d..f19f204

This rolls back to commit bbab04d264d9e6bd175ba75152a1ee950cb54162.