Remove the 3.0/3.1 hacks in favor of an error.