Remove unused and largely pointless function

Going to revisit where we handle this anyway

Change-Id: Ib05ff56926d2f5104250e56975f9c68a5f9965c2
Merge "Remove unused and largely pointless function"