Reverted fixes