Revert removal by P. Grosse's commit