Revert "Merge"

This reverts commit e9e73b3a00dd03e675d00ae0715437fa9b169348.
Revert "Fixed conflicts on merge"

This reverts commit 643cd424f854e4741afb53211490da8af24a3ca9, reversing
changes made to 23466e7776eb3180d11915e7ba2fc664540b6102.
Revert Merge