comment out new flag until feature is ready