First supply handlers, then reorient

Change-Id: I3d6b629230da696f0458bcdb508cc1413e89a733