Bug 929312 - fix hydrate function