back out cd14344666c7cc42df2da78ed1d8af9854cd94b0 from v1-train (bad merge conflict resolution)