VE-236: remove hacks from 3rd party code; move them to our code.