Revert "coconut: shot in the dark"

This reverts commit 65eca365914ddffa3f6f086ae39f733d2fa93b4f.

Change-Id: I3a542f628440efc2dc245beabf1d0c1059524c94
Merge "Revert "coconut: shot in the dark"" into kk44