Revert "Broken, Reason unknown"

This reverts commit ac1c35e2cea1825150cddf3dd082d9727da2e64b.