it is complicated enough that we should implement that logic only once

Change-Id: I0cc5ffb871223b27df825f21612e3c8f6f2febb3