Revert a few changes to match with pbox client for now.