Fix expire_session_data_after_sign_in!

This is for #2660.