Attempt to fix the build -- jlayton, please check!