Revert 42477a11 Issue #3350785. Revert 305ee4ac Issue #3273208. Revert 62078229 Issue #3212302 . Signed-off-by: Pat <27246-micropat@users.noreply.drupalcode.org>