Reverting 1bc7e8a per Spuds request :: plus some additional commits