LPS-51565 Temporary workaround for regression introduced by 4a078693a9a7cefdd6bf29982e92f35cd2ad7d53