Resolve #3110831 "Cannot un disable a 10 3"

Casey Grzeckarequested to merge
issue/drupal-3110831:3110831-cannot-un-disable-a_10-3 into 10.3.x

Relates to #3110831. This MR rebases the work on !1474 (closed) to work with Drupal 10.3.

Merge request reports