Mantis Ticket 0004370

Reverted by request, using Original URL will slow down the sites