Revert 2502492..e6fefd4 [skip ci]

This rolls back to commit 25024929f59b00c30eb52beeceda4c2721f07b19.