am be5e80e2: Merge "Delete pointer sized fields"

* commit 'be5e80e21d4b06d72b30b78ed195fe557a0b687c':
  Delete pointer sized fields