Test is still failing with increased timeout. This reverts commit 864b3c37c65a4294735bbdb041d17b112a2659cc.