Restore 1.8 compatability.