[PROJXP] Reverting some changes...