Fix regression caused by using newer version of Grape

This commit fixes the regression caused by using a newer version of Grape and Grape entity.  This solves Issue 4023.
Merge pull request #4076 from bke-drewb/4023

Fix regression caused by using newer version of Grape