Merged eb/reverted-7899 -r7928:7930 into trunk. This effectively