Revert "Bug 209"

This reverts commit 8ab41d9e9bd54549a0d9eda1255b570b22ca9ca8.
8 files changed