Revert "Remove back-compat symbols"

This reverts commit d6cddbb10d2cde157dfbc48ce4cbb1cd86fdceb4.