Reverting some unintentional changes