A bit of a reversion.
Merge branch 'hotfix/2.1.5'