If we're not taking the patch for CA-146815, we don't need this patch
for CA-147684 either, because it is caused by that patch.

This reverts commit 71de9ae14a9b50070475e48d93afc14b9a1cdcdc.