Revert "Issue  #522"

This reverts commit ad5c8bea67de047be95987be397a58f2bf831aa4.