Revert "Merge branch 'v1.1.0hd' into v1-train"

This reverts commit aa25846b5cebcde99d64de615227e83f655c9abb, reversing
changes made to 11df918f3c852e6acf8012ba80f363a64d854e41.