API: Bug fix: Backed out some code that was not ready for prime time