Fixed circular dependance introduced by recent merge.