Revert #1530 as it causes unexpected results.
Merge branch '4.0'