upstream

Change-Id: I1e634f7491f8e8456caae337f6a1182bcac056a0
Revert "remove this for now"

This reverts commit 524562c6bf8d49732abe43ee31d36f299c9bf5da.
Revert "Forgot these"

This reverts commit 24e0419fd295f686380aa3e258ec55f421397bb0.
Revert "Why the hell not..."

This reverts commit 1a0c4d8e8439f50f05e4477543ef4665c7b0b4fd.