This reverts commit 791ab05e08. Problem was fixed in 4a1b9dcc & 1ac35420
791ab05e08
4a1b9dcc
1ac35420