We'll be sure to enable this after merge.