This reverts commit 116678372564e9559306baf3830b30518fc5109c. It's not as simple as I thought, needs some local changes too.