Undo changes that broke the build pack

This reverts commit 897a3182cf4acb2f9a076b373d2f8e513c0bb887.