LPS-45262 This should not be needed anymore.