Revert to original behavior and add more logs.