Revert to original + add redirects