Messy 2.7 parallel commits