Revert "20130415 update"

This reverts commit d9ef683e74a56589d2ede9409fc65d64ccdcd274.