This reverts commit d7d0dfd9.
The patch was ineffective and thus being reverted to ensure we don't build up cruft.
Signed-off-by: Martyn Welch martyn.welch@collabora.com