Bug 839746 - Remove workaround that was hard to uplift.

This is followup change to #888 that did not used method to avoid uplifting it. This change just removes workaround.