Revert erroneous modifications from 810335098fb8dbbfbd1b5af449591fc8fdcb9a11