Reverting change from issue #1291