Revert "Allow CPU Based Alignment Handling"

This reverts commit e598599f4679888b181cb526487a5e76ae9a2226.