LPS-45508 This shouldn't be needed