Previous commit, but with less pruning