Fixing the previous commit so we don't have a circular include. Under the new regime...