Remove the remaining pre-3.4 compatibility hacks