Revert 034485f..c506e76

This rolls back to commit 034485ffff586179c48270dd9d2c723f0f6afd4c.