Revert to original grammar to allow neater pull request