Temporarily remove waffles and accommodate sole ussage now
Merge pull request #1786 from darkwing/temporary-waffles

Temporarily remove waffles and accommodate sole ussage now