Revert ddb0633..4881374 [skip ci]

This rolls back to commit ddb06334576cf711f6242fb9b97121a00051ca8f.