Re-rolling the patch in #118 for 9.2.x