This reverts commit fd0bd315c1f344b95ad54042981bc556229a046a. This reopens #114 as it has been two weeks and this is the change that broke HTML5 validation as far as I am aware. This is also a lesson to not do more than one thing in a commit.
Closes #114