Revert some changes that were overwritten.
New CherryPy fork.