Reverted to safe commit