Revert a3cedd6..426b113

This rolls back to commit a3cedd67838d25a75416151b6333026f4cd4ab45.