This reverts commit 891c3cf9 as it turns out that the error was not caused by this commit, the error caming from D124526 instead.