*sigh* trying to make this backward compatible is proving to be a PITA.