I merged patches from #8144 into HEAD to fix nasty recompilation-checking behavior. As a result, the interface format has changed, so you'll need to clean your tree the next time you sync up.

--