Workign on #3215.