An alternate attempt at #992

May as well update the build command's build_lib as well