Initial implementation has been replaced by a single method call