Revert 1cd09a9..94ffb55

This rolls back to commit 1cd09a9458a5057b689e7761482c39703a103589.