Fix derrick build order-related hard lockups.