Switch back to including features, not depending on them