LPS-37846

LPS-38018 Fix by reverting previous commit. Please push