removed incompatible changes inherited from master