Revert "Huge Bug! :O"

This reverts commit f41a482af1eff43d43a4c32126ef8d37ebd5ce76.