Fix default_spec run

Partial revert of 9d2dce20baf902870c5cb23f257dfe783dd41434