Should-be-working commit, haven't tried in a setup yet though.