Revert "Add Map support to RequestFactory"

This reverts commit 1a8c2ccf9b601fd383fd1cb9c8f8db9048434842.

Change-Id: I8de39b5831caea046730cd85893953307ef7c886