Fixes #519 by partially reverting 13ad5fa4