Merge changes from borked redirect branch.
It will still be available for amusement.