Revert to c1b2988eb0c548e4b01a93759fcfd65614514309 (Merge branch 'hotfix/0.3.5')