poorndm/revert-train-core-changes