Reverted back some risky changes.