am faebb8f4: Revert "Reference headers in their new location"

* commit 'faebb8f49fb0f4c0810c08f76246f65fd95bfdfc':
  Revert "Reference headers in their new location"