Revert "Revert "TheWeatherCompany/grid-api#813""

This reverts commit 3087fb3278046094d8f26815e3e43798fd0768a5.