Cut out another 30s, though the steps may be aggressive for CI