Splitting into another bug.