Revert HHH-7797 in 4.1.x

Description

On recent mailing list discussions, it was decided that should not have been brought into 4.1.x to begin with. Although the changes were good and necessary, it quickly became complex.

This will revert and re-apply under the older setup.

Environment

None

Assignee

Brett Meyer

Reporter

Brett Meyer

Fix versions

Labels

None

backPortable

None

Suitable for new contributors

None

Requires Release Note

None

Pull Request

None

backportDecision

None

Priority

Major
Configure