Revert "130812 Naddola Test with Yong"

This reverts commit f0dfca6780db3b64c4876f40ea51e309ab4873dc.