Revert fa30e18..5764cee

This rolls back to commit fa30e1865f9d64e06ce78b2390989c795eeaaee4.