Revert e130c31..f127ef2

This rolls back to commit e130c3179d8d5ebac9230d90c48dd0f5b66586d4.