Reverting unintended changes. Fixes #564