Revert "Preparing for revert"

This reverts commit 0919ea77c34364f4c07c4db6cc642f86af05a3f7.
Reverted