I will cherry-pick it and do like you proposed