Clear up some copypasta

Change-Id: I453bd42e24b059e86e71dc2a64a0d6f524f7a197