CORE-26: Revert, duplicated by CORE-20