Revert the toHTML parsing and fix the broken tests. Get ready for RC5.