revert 77d5fb1, since it broke UT
add AWS::AccountId global variable