Merge pull request #4076 from bke-drewb/4023

Fix regression caused by using newer version of Grape