Revert "Fix #1412"

This reverts commit ca04e8d35ede00aeacfc4050352dab0af7055d4d.