am 1c4ceae: undo temporary alignment hack

Merge commit '1c4ceae38f3fd7eb1e451d430acb5d99f257b0f9'

* commit '1c4ceae38f3fd7eb1e451d430acb5d99f257b0f9':
  undo temporary alignment hack