LPS-52001 remove no longer needed method

This is a resend of LPS-51940 with LPS-52001 on top. Except for the rebase, I've made no changes to the original code of LPS-51940; all changes go in LPS-52001.