Revert "Add waffle support for toggling features"

This reverts commit 5ff6ecb3dfc27b21bf79151b0a84e7050bcfa645.