Removed waffle hack (bug 1004785)