Tagging 3.9.4 with markup match fix and removing extraneous code.