On second thought, this was needlessly overbroad. Missed the fact
that the code is strictly for ulf.

Change-Id: I96773d6e2a9af473e8c8309421b4900c0b76667f