CFY-598 tweak to work locally for now