Revert f433aae commit.