LPS-37461 Discovered bug while backporting
LPS-37461 I don't think we need this?