Revert "Revert "Revert "Revert "ok to use the shortener""""
Revert "Revert "Revert "Revert "ok to use the shortener""""

This reverts commit 984706c9b3625973797c4ec2ae318c8abfb4ee07.

robb-broome/jinglepie,robb-broome/jinglepie,robb-broome/jinglepie