Revert afb58e4..58cf48d

This rolls back to commit afb58e42c1b3c19b5b73fbdbdc9a60614ad8cee6.