fixes bug 924635 - Remove all waffle switches for public API

@AdrianGaudebert r?