Fix for broken JS caused by LPS-39433