Revert "Really failing here, trying again."

This reverts commit d9e74d9ed82a157c3ea65f03c3d6d6b68bb014cc.