TODO: Re-prioritize after real-world use

Change-Id: I75aea313ae8f8c683ba7a05181ae82c62063523b