Revert "Preparing for merge"

This reverts commit 6ecc15c881f9f3a15bb6f37e0f7e114f2056132c.