Revert "Merge pull request #11009 from mozshiao9/v1-train_settings_889717"

This reverts commit 7ee822b8ad62cef335c60bda489887353fcd0806, reversing
changes made to 0ce3196d563b07b257850de2583b83f219a98a83.