Unfortunately not, because in my country there are no laws that forbid voiding warranty for product disassembly, so you either take it apart and lose the warranty just because you've opened it, or you rely on your warranty (which we still got screwed over with). So most likely it will be "use it as is before warranty is over", even though doing it this way feels awful...