Revert "Fixed compilation issue"

This reverts commit 2cf8a124a0d1d41798b733cf41bc1ff3958e7cd2.

Second part of the previous reverted commit, for 3.0.x-2.11 compatibility.