Revert b416291..9977af9

This rolls back to commit b416291540e47fd9f4ff9c73ee35136ca719cc0c.