Hopefully the final backwards compatability fix.