Upstream API breakage fix, remove superceded feature