Revert "Fix #949"

This reverts commit f65689f9d78b56cf6f86b0c6a4de27cfb8e844a3.