Bug 890952 - Removed some stale waffle calls.
Merge branch 'master' into bug890952-cleanup-waffle