Revert e5d98a5..606c6ba

This rolls back to commit e5d98a57092876d5565ee23c79d730b21897fbef.