Change Details

Addressed point made by @tomek here:

Addresses point made by @tomek here: https://phab.comm.dev/D5445#inline-35863

Addresseds point made by @tomek here: https://phab.comm.dev/D5445#inline-35863