Re-apply 180974 with the build error fixed.  This was the result
of a weird merge error with git.