This probably belongs in here instead

Change-Id: I43af8b654bd41327b58aa6286533a03b11a20f58