Bug 890952 - Removed some stale waffle calls.