reverting some fixes