Fix of issue #2235 was reverted.