Remove over optimization which didn't work correctly

Added story PLAT-293 to do it correctly.
This fixes TNL-764

@cahrens please review