Re-added the compat, now that I'm less of a derp