Fix building.

This will need fixing. We either remove the patch for this file or use another method.

Change-Id: I590ccc1caffd5dc7aa1b0e24a224314d235894d3