Ah, big build patches just before release! :) Ray just committed something in a similar vein. Can you check if that works for you with or without reverting r8392? -r