Required to allow us to remove these altogether.
Created attachment 45159 [details] The patch
Transmitting file data ........ Committed revision 52329.