Add configure back - regression tests pass