Revert "10312014"

This reverts commit 89f46be264a6363452a8718ed9f4b253a4ae32e8.
fixed?