Switch to my Settings fork, remove removal of extras