Revert "Multiple changes"

This reverts commit 0d30e07b658380914c4ce7ee102c847a6a2aa097.