The previous patch failed. Here is a new patch that works.