Hopefully fail to break anything in the process of syncing with trunk (r47786)