ID: 746 - Revert multithreading support and E2E 1.35 bugfixes

This reverts commit 1ab2bb23ba0929520085ec99d90d018ef5a45e1b.

Change-Id: I6015ac987db9688df858d5382253a55c3117a2a4
Signed-off-by: Jeremy Ho <jujaga@gmail.com>