Viciously murders 2.1.2

It's a feature that boldly breaks the code freeze
Merge pull request #3662 from Ikarrus/212iskill

Viciously murders 2.1.2