Revert older commits

This should fix the weird actions we have been seeing lately