Reverted the interface changes introduced in 3f720dc7.