Plfm 2682

make sure disabling works on staging.