Re-add disruptive warning templates that were removed