This removes a bit of duplicated code and workarounds that are no longer needed now that we require a newer SDK for compilation.