Interim update, works with build_py/build_ext.