Change state and scope to align with Chrome implementation.