Merge "Drop workaround for Python < 2.7.4"