Upd to make consistent w/ 04662d2476 for future pull rqs