As its' behind a flag, rolling them up to use the new loader should be a next step