Re-rolling #72, as patch was failing against 8.9.x.