Reverted a few potentially unnecessary changes