Revert "Hmm, just maybe this one fixes it?"

This reverts commit d82529eb5cc1d02784b5cf5ad8b7741cb410f403.