Revert prior commit and put in place a more robust fix. Also add some annotations and check file for other errors (none found) xibosignage/xibo#2226
Revert prior commit and put in place a more robust fix. Also add some annotations and check file for other errors (none found)
xibosignage/xibo#2226

xibosignage/xibo-cms,dasgarner/xibo-cms,dasgarner/xibo-cms,dasgarner/xibo-cms,dasgarner/xibo-cms,xibosignage/xibo-cms,xibosignage/xibo-cms,xibosignage/xibo-cms,dasgarner/xibo-cms,xibosignage/xibo-cms,dasgarner/xibo-cms,xibosignage/xibo-cms