Revert "Use mw.Api"

This reverts commit b447050070d5297158b4ba0f86d14c7f845573b8.

Problems reported with error handling.

Change-Id: Ic1498591fa8d145eeebb971c56b1c8587925a3e8
Merge "Revert "Use mw.Api""