Implement old spec, passes tests.