Revert "Trying to sort out missed commit"

This reverts commit fabb522628f3a2501f5b64add49c894ab4e49cb0.