Do not break 1.4.6 compatibility yet