Implement commit order kludge

Closes-Bug: #1259134
Change-Id: Id8d14cefd54d4f35a8c781475c1c59eab7ad19fc