Revert "Move filling of decision rules to respective orders"

This reverts commit cc5527c843a8bb8a2308f90a89602fc3a9757821.

This commit had the negative consequence that dr.ghx, dr.ghu… were no longer
set at order 3.
Better fix for the issue raised in cc5527c commit message