Revert "Fixing compile error on 1.3."

This reverts commit 77eab0d69f5fc97590d613733f813a8a9a729198.