Revert "Fix #1615"

This reverts commit a8359f29a81a9cc6836b14535a3256f06853482b.