Reverted to previous version (before the recent doc comment change
commit)