Switch back to 8.1 target for easiness sake