AUI-905 - Remove unnecessary backported code.
AUI-905 - Build