revert 852d3bf0842e85995e346facfbc84fecee0d6e59 + 563e9faf6bb3e2dbeca5f513b8bc11d793bd7e4e, fix #1564