Reverted some reverts accidentally done