VID-2089 adding back in some old code for backwards compatibility until parser cache clears