I had to make this potential backwards compat change for this to work.