LPS-36109

Hey Jon. I tested this fix against 6.1.x and it fixes the problem there too. However, I know that the ticket doesn't mention 6.0.x and I wanted to test it anyways. But, I'm being blocked by another bug that prevents me from adding categories. Since the bug needs to be fixed on ee-6.0.x (I havent filed this yet), I'm planning on seeing if we need to backport this all the way to 6.0.x or not.