Reintroduce code clobbered by 2012 12 22 contrib