Fixed 5791b5f's merge.