revert 441c532c24 commit and fix conflicts