Revert 568a49c4092835a11255bb75d035ea13c7e692b3 and do the changes properly.