Revert 62b1b6e..8424e86

This rolls back to commit 62b1b6e2d14b219ba8ec3864bce17f2e2937009a.