Rolls-back previous commit for interim use until kriskowal merges my pull request