Merge "hal: revert alignment logic"