Revert derivative change

@toddboom look okay?