f5e2fc6958
This reverts commit d7684470a240752a5e17938def324f4f1730584a. Fixes #1529
This reverts commit d7684470a240752a5e17938def324f4f1730584a. Fixes #1529