Revert change to function alignment b/c existing logic was fine