/cc @jmassara - This has to go before the modify attributes so that the attributes are properly modified on all resulting AMIs.