Revert "Fixes #2"

This reverts commit 0aa21d35f18f5f19ae6f28664c09b285411b1aaa.
Revert "Rhine Fixes"

This reverts commit 8845711bab4044961cdfeb6450c4407769d62b4d.