am d024f984: Cleaning up some reordering issues:

* commit 'd024f9845a0974ab525baad085f316031cd5a742':
  Cleaning up some reordering issues: