Reverting potential causes for new bug