This reverts commit 6f22c2a9. Reason for revert: Error messages are not friendly when something goes wrong. Change-Id: I13a6a2908a44ebd4599138cd2a61ff4b3cf055eb