Reverted needless changes