NOT MERGE This approach is TEMPORARY until we can do this properly. Change-Id: I81a8f852df501b2faccffdae7cac954855a6c98f