Reenable and set num_steps to 6 (#3735)