Partially revert 83ba7c2f12fc7f400122bbb30c9c6913a4b390d8 (short open tags)