Revive fix.
Merge pull request #3484 from Segrain/master

Revive fix.