Revert changes to configs to avoid conflict with 4.x branch