First checkin of repatch that passes all existing tests.