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

This reverts commit d41e8fcccb8cd9c1414796294c40a474dbcb7dcf.