Rework bootstrap to activate Affwp. #339