Revert code deleted by d2d8af8