cherry-picked fix from prototype branch

Enyo-DCO-1.1-Signed-off-by: Cole Davis <cole.davis@palm.com>
remove prototype from tree

Enyo-DCO-1.1-Signed-off-by: Cole Davis <cole.davis@palm.com>