Move this to the server.
No longer needed
Merge bug25935