Revert "Another Buggy"

This reverts commit 04325012971f78c93db9787a828f6c01b9b630c3.