Back out d890e603d751 (bug 961919) for reenabling failing tests