Revert "xRevert "some weird stuff""

This reverts commit 3b6edfb3f80f54601cb8fc5d96f2fee91e7be743.