Revert "d2: Limit MDP composition to 3 layers"