Revert "Reversed suffix order"

This reverts commit 768259cfb66565ec322591024cced10523dc17c1.