Revert "ShortURL performance boost"

This reverts commit 77b06ffa08b182a0a6b26b259b011dd42f112854.