[634215] leave the waffle switch in