Partly revert r457111 so that I can commit this with the proper commit
message.

No need to fiddle with PORTEPOCH since we're going back to this version in a
moment.

Pointy Hat to: zeising
Approved by: portmgr (not really, but I need to get around a commit hook)