#1811: That last step is important.