Switch back to vanilla Coccyx

Change-Id: Iaa6bad53b84779b643d227aff258e2bee68f8e98
Merge "Switch back to vanilla Coccyx"