Revert to working 2014 comp code