Fixes #1081, fixes #918.
Instead of doing a separate redundant build. The main problem was that the files weren't being cached. There is probably a better way of solving this but this seems to be the simplest for now.