Same as before, rebased against master.