Remove transition code added in #3398 (877281c).
Merge pull request #3670 from 6a68/remove_3398_transition_code

Remove transition code added in #3398 (877281c).

Thanks @6a68! Tests pass, travis is happy, I'm happy. r+. Merging.