Revert last change v3

Same as previous reverts.