Now that master is safe we can do it. There's no need to test against both libraries since we are hard locked at 10.16.2.