Fix for botched merge 730ed711.