Revert, this was not a good idea