Reverted change from issue #352.