Revert Bug 1005760 fix, and translate cached nodes on app startup

This reverts commit 580733cf14170dd01c4cfdf48de122146e10464d.