Roll back on changes for bug