LPS-44739 Revert code that uses offending method

cc/ @robertoDiaz