Remove the temporary fix and bump the minimum SDK