Move configuration set out of conditional