Because two is better than one

Change-Id: I3056132f65df71fbb5e55419b2698e5d643f8263
Apparently someone couldn't make up their mind on what to name this

Change-Id: I08522a4f794b76fa95f86f4d72ca2988579ab65b