Revert surdupetru's changes