The fix is no longer required with the restored passthru version. This reverts commit 6020fe2508.
6020fe2508