Replacement PR for #702

To see if a fresh branch and PR will build with Travis.