Viciously murders 2.1.2

It's a feature and thus boldly breaks the feature freeze