Patch 3.14 support back in
Release 3.16jak1