Nevermind, temporary till i get an idea to resolve this.

This reverts commit 58fd21d68347129748d325b95c978bcb960b46e2.