Went ahead too quickly. This reverts commit d9faceaa. Change-Id: I1610deaf89b38037cf2786d135a59c48b10ced0c