Revert "Fix #503"

This reverts commit db1f34bebaf34eda8b5d997b9b22b9a3e4666059.