Reverting erroneous fix