This reverts commit 767ec883. This results in a some incorrect alignments which are not covered by existing tests.