probably fix #4532 (reverts one change in aa3e488)