Move onDisable() to right under onEnable()
This is really an EGit test