Patch Set 1: I would prefer that you didn't submit this

I recently added a TODO comment for both usages of setDerived in commit b07033deb2140b321b8d4882161f6e0431bcdb20.
So I think this change could be abandoned.