web commit by JoshTriplett: Restore type/core tag; template did not work as expected.