TRUNK-3937: Patch didn't work readded the code, and tested in browser to make sure it worked
Merge pull request #402 from Fahv/TRUNK-3937

TRUNK-3937: