revert changes because it is not safe to do it like this