Applies fix from MR 183 to 053e3dcd so that it can be deployed