Reverting master branch back to SWF 1.17 for now