Revert "Change after pull request sent"

This reverts commit fd81f9a1a776a19c9113736c75bfe3235a41d9eb.
Revert "Second change after pr sent"

This reverts commit 80a0c00f26f6dec96e4bc7294c04b1049a1e9edc.