revert 2 parts of the patch, Daniel
1 file changed