Revert "Updated patch to work with current trunk."

This reverts commit 674e688ab266249427551fff390179f6340a46e9.