Revert "looks like this patch isn't necessary when we don't configure twice"

This reverts commit 064893d4222c8ceafe6ad0691c92e7405eac50b5.