Revert potential breaking BC on 2.1.

Signed-off-by: crynobone <crynobone@gmail.com>