Revert of e742e8cf, I guess not intended?