Revert 0422433..052690b

This rolls back to commit 042243350b400571c682a086af542b89f63c1b73.