Revert "issue 397"

This reverts commit 5af01de160522058e3efe6f713e03e2222927fbd.