Revert 64c6f2d..4b08ac6

This rolls back to commit 64c6f2de58f0813ba9696b96f3289c8618c0211d.