Revert two erronous fixes from commit f90aa1177bf2ee7f8376b4c352e3fd8f65d25ded .