Removing temporary redirection prototype - part of #24