bug 1110904 - move to waffle switch & manager method