Fresh patch from revision 7472