It's defficiency time again

Changelog included.