I've left this update for now, given the problems getting python-common to build