Revert "bugged"

This reverts commit 313abafa19b388a2b5a45ad974b0175e9f511a04, reversing
changes made to a7c2bb9dc89262860ec036bdc9c13542bd9367f4.