Revert " Support for CPU alignment from Chad Goodman"

This reverts commit d2fa911fec2f1647b8440c7c4dbcef82cc7ece48.