Apply hstore patch from Oleg.