I would like to indicate that this still needs fixing (and the issue shouldn't get lost). I provide the commit diff of my deactivation patch as URL to point out this place.
I have now the correct fix which I will push shortly.