Partial commit, will break builds.  Do not get this commit until a new one is pushed.