Was negated by #2236.