Revert "Merged wip branch"

This reverts commit a0fb861bee28b37b423e448ef205f6833acfe569.