Revert simplification from 563c0648