These changes are effectively handled as part of another, higher priority CL. This reverts commit 7cab2859. Change-Id: I4cf47eee219870b2758997fe5bd6019d83b82451