Rolling back the code to the effective state of ecbf41c8843d18766c521eaf8cc822724b9ffd67