Reverted usage of newly introduced API in sdt.core.