This reverts commit b166a91735. Maintenance is complete. Change-Id: Id19abb4b9de77fe06cbfad318f01d85aecc17eda
b166a91735