revert horribleness related to APC_ALIGN ... KISS :D