Revert "Try to fix issue 457"

This reverts commit 20175f223c236a159a5754b495bd26d728e9ab53.