Revert part of 677b38a11dc812e6c832a7ab2a2e6acba9c79486.