Merge pull request #2809 from ctiller/fix-the-noggin

Fix integration breakage