Using upstream python-mode again.

My change was merged by now.