Revert "Other changes"

This reverts commit 805a8f6efa261e7a1a263ec13ff1bed957739fad.