Revert 8a1b909 and introduce another change suggested by Frank.