Reverting dev error tracking merge