tweaked: we now align to upstream, just pending official packaging for upstream before we can depracate.