Revert "Merge branch 'jc/pull-training-wheel' into next"

This reverts commit c39bd15b7751accf2ef4a2b4884548e11a3e1f1a,
reversing changes made to fa6ffc72267991527ef0d686eaa9347b2b4fa037.
Waiting for the conclusion of the discussion to seek a more
user-friendly alternative.