Remove over optimization which didn't work correctly
Added story PLAT-293 to do it correctly.
This fixes TNL-764
Merge pull request #5933 from edx/dhm/bug_tnl-764

Remove over optimization which didn't work correctly