Redo 22825 but this time with caring about alignment.