Switched to passing in module instead of trying to guess module on de/activation