Revert erroneous modifications from 6aa6d2e53d606c6d01ddfd50d0877deac87054d8