Revert "Seems to fix that pesky 'ambiguous h1' test failure"

This reverts commit 67254ab5f88b007541a040d862c01fec765df7ee.