Bring back code removed by features module