revert something that's obviously wrong
unnoticed merge conflicts