This is being removed, but doesn't seem to get added back again when it's needed.