Revert change for CA-146815. This change is slightly risky because it changes the order of events, so we will not bundle it up with the other changes but will consider it separately.