Can we drop this change? It will conflict with #1916 - I'd rather make sure the helper function is clean in that PR which completely restructures most of the example code.