Temporarily reverting to resolve promotion issues. This reverts commit 3dc47bc839. Change-Id: I578d1d627e4b9779b146bf2827894522d6673d13
3dc47bc839