Revert "Merged branch"

This reverts commit 6233f37da101edebff5782fb7a12ef146365e972.