* was previously money-patched in on Debian/Ubuntu packaging

Change-Id: I9cd14b0d61e6c73181f368387fb560b4edb383a6