LPS-38289 - SF: Just flagging this one as a hack (for future reference in case we are able to remove it, or if we need to repeat this elsewhere)