TRUNK-3937: 

Patch didn't work re-added the code, and tested in browser to make sure it worked.