Is this really necessary? Can we do this during the build step?