Same reasoning as the previous commits. This is now handled by the option system so we can remove the redundancy.